Revision: bazaar--devo--1.1--patch-42
Archive: thelove@canonical.com
Creator: Canonical.com Patch Queue Manager <pqm@canonical.com>
Date: Thu Dec  9 10:49:28 GMT 2004
Standard-date: 2004-12-09 10:49:28 GMT
Modified-files: commands/star-merge.c
    libarch/build-revision.c libarch/merge-three-way.c
    libarch/merge-three-way.h libarch/pristines.c
    libarch/proj-tree-lint.c libarch/star-merge.c
New-patches: robert.collins@canonical.com--general/bazaar--devel--1.1--patch-37
    robert.collins@canonical.com--general/bazaar--devel--1.1--patch-38
    thelove@canonical.com/bazaar--devo--1.1--patch-42
Summary: make --three-way the default for star merge, and fix thus uncovered bugs.
Keywords: 

Patches applied:

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-37
   make --three-way the default for star merge, and fix thus uncovered bugs.

 * robert.collins@canonical.com--general/bazaar--devel--1.1--patch-38
   check for old reject file path too

